Fix inconsistencies in our pango deps

We were applying the pango version requirements inconsistently,
leading to different pango variables being taking from system
pango vs the subproject at times. Thankfully, meson detects
this and complains, so we can fix it.

diff --git a/meson.build b/meson.build
index fc0b1ef7fcd2977bcba1ecd6b2cc628a56d7e019..912c0f8a955dfd3b66da150bfdf00cfccff58c29 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -354,7 +354,8 @@ fribidi_dep    = dependency('fribidi', version: fribidi_req,
 require_pangoft2 = wayland_enabled or x11_enabled
 
 if require_pangoft2
-  pangoft_dep    = dependency('pangoft2', fallback : ['pango', 'libpangoft2_dep'])
+  pangoft_dep    = dependency('pangoft2', version: pango_req,
+                              fallback : ['pango', 'libpangoft2_dep'])
 else
   pangoft_dep    = dependency('pangoft2', required: false)
 endif
@@ -364,7 +365,7 @@ if win32_enabled
   pangowin32_dep  = dependency('pangowin32')
 endif
 
-pangocairo_dep = dependency('pangocairo', version: cairo_req,
+pangocairo_dep = dependency('pangocairo', version: pango_req,
                             fallback : ['pango', 'libpangocairo_dep'])
 pixbuf_dep     = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req,
                             fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'])